Merge branch 'a11y/atspi' into 'master'

A11y/atspi

See merge request GNOME/gtk!2698

diff --cc gtk/gtkdropdown.c
Simple merge

diff --cc gtk/gtklistview.c
index 5382c7b1ad14785a5a9717c2b4e85a77d3ba830f,95091e1f139c314ca20e811672ecc0c008f7dffd..ad8f8ea16c1df5175735d5d614e6e1af53db0614
--- 1/gtk/gtklistview.c
--- 2/gtk/gtklistview.c
+++ b/gtk/gtklistview.c
@@@ -28,7 -28,9 +28,8 @@@
  #include "gtkmain.h"
  #include "gtkprivate.h"
  #include "gtkrbtreeprivate.h"
 -#include "gtkstylecontext.h"
  #include "gtkwidgetprivate.h"
+ #include "gtkmultiselection.h"
  
  /* Maximum number of list items created by the listview.
   * For debugging, you can set this to G_MAXUINT to ensure

diff --cc gtk/gtkpasswordentry.c
Simple merge

diff --cc gtk/gtkstackswitcher.c
Simple merge

diff --cc gtk/gtkwidget.c
Simple merge